Skip to content

Update develop branch with latest commits from 2.1.0 #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
blondfrogs merged 1,243 commits into from
Oct 8, 2018
Merged

Update develop branch with latest commits from 2.1.0 #368

blondfrogs merged 1,243 commits into from
Oct 8, 2018

Conversation

@blondfrogs
Copy link
Contributor

@blondfrogs blondfrogs commented Oct 6, 2018

  • When we switch branching strategies, we started using the branch develop2, this branch wasn't protected and could of been deleted by accident. We will now be using the branch develop again

blondfrogs and others added 30 commits August 3, 2018 16:34
Remove spam logs
af84a7f
Remove spam logs
8f61c10
Fix large asset transactions failing asset check and asset serialization
8293f6f
@cfox
Switching to DGW at a specific block.
9fd33da 
Widens N from 60 to 180 minutes for DGW.
Future block rejection changed from 120 min to 12 min for DGW.
Under fix to CHANNEL namespace
b760682
h
b35bd9b
@blondfrogs
Merge pull request #197 from RavenProject/under-channel-namespace-fix
9fd7e54 
Under channel namespace fix
@blondfrogs
Merge pull request #195 from RavenProject/cfox-rip9v2
31eb2b5 
Switching to DGW at a specific block.
Update regex to disallow improper asset names
d8027a2
Add back $ to regex expression
ee999c5
Add -fPIC as default on Linux builds to avoid build errors. Add addit…
82c11a6 
…ional NONCE for miner tests.
@blondfrogs
Merge pull request #199 from RavenProject/revert-fpic
b8aad20 
Add -fPIC as default on Linux builds to avoid build errors.  Add addi…
Set reissuable to true by default, update typos
38b322d
Quick bug fix for creating new asset with ! in it. Fix typo
9883ee2
Remove commented out code
45b0346
@blondfrogs
Merge pull request #196 from RavenProject/sub_asset_2
ed0ea50 
Ability to Create Sub Assets via RPC. Fix large Asset Transactions
@UsertJonPizza
Fixed/ Edited a few things
b3a6fa2 
Fixed a date and added a few things
@UsertJonPizza
Fixed typo
19a96f6
@blondfrogs
Merge pull request #201 from RavenProject/typo_fixes
7b62d97 
Typo fixes made by  UsertJonPizza
@cfox @blondfrogs
Testnetv4 and some block timing for DGW (#200)
f95a36c 
* Testnetv4 and some block timing for DGW.
@blondfrogs
Add sub assets to func test (#202)
c344555
One command
59a393f
@cfox
Fixes a test case.
c94460a
@TronBlack
Merge pull request #204 from RavenProject/tron-issuesubasset-to-issue
7b69824 
One command
@cfox
Removes some noise on stdout.
799a9b2
@cfox
Updated version to 2.0.3
25be212
@cfox
Merge pull request #206 from RavenProject/release_2.0.3
fc5d1a7 
Release 2.0.3
Add asset issuance scripts
8930753
Include some documentation on scripts
c3c372e
fix md
fc169bc
blondfrogs and others added 24 commits October 3, 2018 10:36
@blondfrogs
Merge pull request #354 from RavenProject/tron-rc0
dfddba5 
Modify version bit for mainnet for asset activation.  Update version …
@TronBlack
Merge branch 'master' into develop2
21e7747
Fix linux build issue
a7c558d
@blondfrogs
Merge pull request #356 from RavenProject/linux_build_fix
0143789 
Fix linux build issue
adding release notes for 2.1.0, rmoving RBF tests
65a5b3b
@spyder46n2
Merge pull request #357 from RavenProject/mney-add-release-notes-and-…
65df38c 
…test-removal

Adding release notes for 2.1.0, removing RBF tests
@cfox
Adds a HOWTO for creating an atomic swap. (#358)
aec8743
Fix for asset issuance
8b65ce9 
reorg
Add asset issuance map to the mempool
71b20cd
@cfox
More testing around assets + reorgs.
177e9a1
Get asset undo blocks setting the correct values with reorged/invalid…
74cebd5 
…ated
@blondfrogs
Merge pull request #359 from RavenProject/reorg_issuance_fix
a170a04 
Asset issuance with reorg that also contains asset
@blondfrogs
Merge pull request #360 from RavenProject/assets_in_mempool
956b324 
Add ability to view asset issuance in the mempool
Fix Issue and Reissue invalidation in the same reorg
4b43290
@blondfrogs
Merge pull request #364 from RavenProject/issue_reissue_data_corruption
b390188 
Fix Issue and Reissue invalidation in the same reorg
@cfox
Adds a functional test for precision change on reissue. (#363)
e987f09
fixing asset activation date and remove extra 0 from version
fa278da
@spyder46n2
Merge pull request #365 from RavenProject/mney-fix-release-notes
0b095af 
fixing asset activation date and remove extra 0 from version
fixing crash when running 'ravend -h'
9d36131
@blondfrogs
Merge pull request #366 from RavenProject/mney-fix-ravend-help-crash
8b862ac 
Fixing crash when running 'ravend -h'
Fix double ownership creation malicious user bug
0cfbd84
@blondfrogs
Merge pull request #367 from RavenProject/double_owner_asset
ce10f59 
Fix double ownership creation malicious user bug
Update issue template
0e86fe6
Merge release 2.1.0 into develop
efa3d65
@blondfrogs blondfrogs merged commit 5feae86 into develop Oct 8, 2018
@blondfrogs blondfrogs deleted the update_develop branch November 6, 2018 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TronBlack TronBlack TronBlack approved these changes

@cfox cfox Awaiting requested review from cfox

@spyder46n2 spyder46n2 Awaiting requested review from spyder46n2

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@blondfrogs @TronBlack @cfox @UsertJonPizza @cfrogjump @spyder46n2 @underdarkskies @carlzimmerman @wolfsokta